]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
appDisplay: Return the parent class' result in overrides
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Thu, 23 Apr 2020 22:04:27 +0000 (19:04 -0300)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Thu, 23 Apr 2020 22:14:43 +0000 (19:14 -0300)
StButton returns CLUTTER_EVENT_STOP in various circumstances, but
AppIcon throws that away and returns CLUTTER_EVENT_PROPAGATE even
when it should stop.

Return the parent class' result instead of CLUTTER_EVENT_PROPAGATE.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1211

js/ui/appDisplay.js

index 2d58541f323ea2e983e331e997aedaac90d7a89e..8139fe9494c400a86d18ee464b0c3a8b99402230 100644 (file)
@@ -2213,22 +2213,22 @@ var AppIcon = GObject.registerClass({
     }
 
     vfunc_button_press_event(buttonEvent) {
-        super.vfunc_button_press_event(buttonEvent);
+        const ret = super.vfunc_button_press_event(buttonEvent);
         if (buttonEvent.button == 1) {
             this._setPopupTimeout();
         } else if (buttonEvent.button == 3) {
             this.popupMenu();
             return Clutter.EVENT_STOP;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return ret;
     }
 
     vfunc_touch_event(touchEvent) {
-        super.vfunc_touch_event(touchEvent);
+        const ret = super.vfunc_touch_event(touchEvent);
         if (touchEvent.type == Clutter.EventType.TOUCH_BEGIN)
             this._setPopupTimeout();
 
-        return Clutter.EVENT_PROPAGATE;
+        return ret;
     }
 
     vfunc_clicked(button) {